Wrap RuntimeExceptions from toolFunction in ToolExecutionException and rethrow #3918

YunKuiLu · 2025-07-26T08:17:16Z

When toolFunction throws a ToolExecutionException, rethrow it directly.
When toolFunction throws a RuntimeException, wrap it in a ToolExecutionException and rethrow it.
Add related tests

By default, FunctionToolCallback should behave similarly to MethodToolCallback.
Specifically, just like MethodToolCallback wraps method exceptions in ToolExecutionException, FunctionToolCallback should do the same.
Here’s the method from MethodToolCallback:

spring-ai/spring-ai-model/src/main/java/org/springframework/ai/tool/method/MethodToolCallback.java

Lines 158 to 175 in 5a1cafe

    
           @Nullable 
        
           private Object callMethod(Object[] methodArguments) { 
        
           	if (isObjectNotPublic() || isMethodNotPublic()) { 
        
           		this.toolMethod.setAccessible(true); 
        
           	} 
        
           	Object result; 
        
           	try { 
        
           		result = this.toolMethod.invoke(this.toolObject, methodArguments); 
        
           	} 
        
           	catch (IllegalAccessException ex) { 
        
           		throw new IllegalStateException("Could not access method: " + ex.getMessage(), ex); 
        
           	} 
        
           	catch (InvocationTargetException ex) { 
        
           		throw new ToolExecutionException(this.toolDefinition, ex.getCause()); 
        
           	} 
        
           	return result; 
        
           }

- When `toolFunction` throws a `ToolExecutionException`, rethrow it directly. - When `toolFunction` throws a `Exception`, wrap it in a `ToolExecutionException` and rethrow it. - Add related tests Signed-off-by: YunKui Lu <[email protected]>

#3918) Fixes #2857 - When `toolFunction` throws a `ToolExecutionException`, rethrow it directly. - When `toolFunction` throws a `Exception`, wrap it in a `ToolExecutionException` and rethrow it. - Add related tests Signed-off-by: YunKui Lu <[email protected]> (cherry picked from commit 1b5cd09)

spring-projects#3918) Fixes spring-projects#2857 Auto-cherry-pick to 1.0.x - When `toolFunction` throws a `ToolExecutionException`, rethrow it directly. - When `toolFunction` throws a `Exception`, wrap it in a `ToolExecutionException` and rethrow it. - Add related tests Signed-off-by: YunKui Lu <[email protected]>

spring-projects#3918) Fixes spring-projects#2857 Auto-cherry-pick to 1.0.x - When `toolFunction` throws a `ToolExecutionException`, rethrow it directly. - When `toolFunction` throws a `Exception`, wrap it in a `ToolExecutionException` and rethrow it. - Add related tests Signed-off-by: YunKui Lu <[email protected]> Signed-off-by: 家娃 <[email protected]>

YunKuiLu force-pushed the function_tool_err branch from c6dd6b8 to b4ad3ed Compare July 26, 2025 08:19

YunKuiLu mentioned this pull request Aug 6, 2025

fix: handle errors when toolExecution fails for functionToolCallback #4012

Closed

sobychacko merged commit 1b5cd09 into spring-projects:main Aug 6, 2025
2 checks passed

YunKuiLu deleted the function_tool_err branch August 8, 2025 16:25

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Wrap RuntimeExceptions from toolFunction in ToolExecutionException and rethrow #3918

Wrap RuntimeExceptions from toolFunction in ToolExecutionException and rethrow #3918

Uh oh!

YunKuiLu commented Jul 26, 2025 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	@Nullable
	private Object callMethod(Object[] methodArguments) {
	if (isObjectNotPublic() \|\| isMethodNotPublic()) {
	this.toolMethod.setAccessible(true);
	}

	Object result;
	try {
	result = this.toolMethod.invoke(this.toolObject, methodArguments);
	}
	catch (IllegalAccessException ex) {
	throw new IllegalStateException("Could not access method: " + ex.getMessage(), ex);
	}
	catch (InvocationTargetException ex) {
	throw new ToolExecutionException(this.toolDefinition, ex.getCause());
	}
	return result;
	}

Wrap RuntimeExceptions from toolFunction in ToolExecutionException and rethrow #3918

Wrap RuntimeExceptions from toolFunction in ToolExecutionException and rethrow #3918

Uh oh!

Conversation

YunKuiLu commented Jul 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

YunKuiLu commented Jul 26, 2025 •

edited

Loading